merge with xen-unstable.hg
authorAlex Williamson <alex.williamson@hp.com>
Thu, 12 Apr 2007 16:30:12 +0000 (10:30 -0600)
committerAlex Williamson <alex.williamson@hp.com>
Thu, 12 Apr 2007 16:30:12 +0000 (10:30 -0600)
commit0dd835abe09996a76ab19bfa150242ef14b966e4
tree0d531c74e7208b07a65665f61a626feb5d8c6365
parent9f6552ac60fabbb0598750ad0348678c1044bbfa
parenta01197aeb4b0e496b2e5ebdff2b1728970e3a351
merge with xen-unstable.hg